Upgrade commons-validator to 1.6 Version 1.6 upgrades the TLD list to version 2017020400 [1]. The version available at the IANA site [2] at the time of writing this commit is 2017032102. Prior versions are not provided. Update the test data to this later version, commenting out the only TLD that is not supported in 2017020400 ("AFRICA"). [1] https://github.com/apache/commons-validator/commit/fe29c2dd861bfc0fe4c397f9f9b220b735ea4ce7 [2] http://data.iana.org/TLD/tlds-alpha-by-domain.txt Change-Id: I2fb3fbc6e4db205d0a1aafdbc6b73a91b2e844ed diff --git a/WORKSPACE b/WORKSPACE index 54c414f..0a2259c 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -311,8 +311,8 @@ maven_jar( name = "commons_validator", - artifact = "commons-validator:commons-validator:1.5.1", - sha1 = "86d05a46e8f064b300657f751b5a98c62807e2a0", + artifact = "commons-validator:commons-validator:1.6", + sha1 = "e989d1e87cdd60575df0765ed5bac65c905d7908", ) maven_jar(
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java index abaaefc..25d9ffc 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
@@ -417,7 +417,7 @@ "@example.com", // Non-supported TLD (see tlds-alpha-by-domain.txt) - "new.email@example.blog"); + "new.email@example.africa"); for (String email : emails) { EmailInput input = new EmailInput(); input.email = email; diff --git a/gerrit-server/src/test/resources/com/google/gerrit/server/mail/send/tlds-alpha-by-domain.txt b/gerrit-server/src/test/resources/com/google/gerrit/server/mail/send/tlds-alpha-by-domain.txt index 9edf6a4..4231f76 100644 --- a/gerrit-server/src/test/resources/com/google/gerrit/server/mail/send/tlds-alpha-by-domain.txt +++ b/gerrit-server/src/test/resources/com/google/gerrit/server/mail/send/tlds-alpha-by-domain.txt
@@ -1,10 +1,13 @@ -# Version 2016060601, Last Updated Tue Jun 7 07:07:01 2016 UTC +# Version 2017032102, Last Updated Wed Mar 22 07:07:01 2017 UTC # From http://data.iana.org/TLD/tlds-alpha-by-domain.txt AAA AARP +ABARTH ABB ABBOTT ABBVIE +ABC +ABLE ABOGADO ABUDHABI AC @@ -22,30 +25,43 @@ AE AEG AERO -#! AETNA +AETNA AF +AFAMILYCOMPANY AFL +#! AFRICA AG AGAKHAN AGENCY AI AIG +AIGO +AIRBUS AIRFORCE AIRTEL AKDN AL +ALFAROMEO ALIBABA ALIPAY ALLFINANZ +ALLSTATE ALLY ALSACE +ALSTOM AM +AMERICANEXPRESS +AMERICANFAMILY +AMEX +AMFAM AMICA AMSTERDAM ANALYTICS ANDROID ANQUAN +ANZ AO +AOL APARTMENTS APP APPLE @@ -56,16 +72,21 @@ ARCHI ARMY ARPA +ART ARTE AS +ASDA ASIA ASSOCIATES AT +ATHLETA ATTORNEY AU AUCTION AUDI +AUDIBLE AUDIO +AUSPOST AUTHOR AUTO AUTOS @@ -79,6 +100,8 @@ BA BABY BAIDU +BANAMEX +BANANAREPUBLIC BAND BANK BAR @@ -87,20 +110,25 @@ BARCLAYS BAREFOOT BARGAINS +BASEBALL +BASKETBALL BAUHAUS BAYERN BB BBC +BBT BBVA BCG BCN BD BE BEATS +BEAUTY BEER BENTLEY BERLIN BEST +BESTBUY BET BF BG @@ -117,7 +145,9 @@ BJ BLACK BLACKFRIDAY -#! BLOG +BLANCO +BLOCKBUSTER +BLOG BLOOMBERG BLUE BM @@ -129,15 +159,19 @@ BO BOATS BOEHRINGER +BOFA BOM BOND BOO BOOK +BOOKING BOOTS BOSCH BOSTIK +BOSTON BOT BOUTIQUE +BOX BR BRADESCO BRIDGESTONE @@ -164,12 +198,15 @@ CAFE CAL CALL +CALVINKLEIN +CAM CAMERA CAMP CANCERRESEARCH CANON CAPETOWN CAPITAL +CAPITALONE CAR CARAVAN CARDS @@ -179,12 +216,17 @@ CARS CARTIER CASA +CASE +CASEIH CASH CASINO CAT CATERING +CATHOLIC CBA CBN +CBRE +CBS CC CD CEB @@ -201,14 +243,18 @@ CHASE CHAT CHEAP +CHINTAI CHLOE CHRISTMAS CHROME +CHRYSLER CHURCH CI CIPRIANI CIRCLE CISCO +CITADEL +CITI CITIC CITY CITYEATS @@ -232,6 +278,7 @@ COLLEGE COLOGNE COM +COMCAST COMMBANK COMMUNITY COMPANY @@ -244,6 +291,7 @@ CONTACT CONTRACTORS COOKING +COOKINGCHANNEL COOL COOP CORSICA @@ -258,6 +306,7 @@ CRICKET CROWN CRS +CRUISE CRUISES CSC CU @@ -272,13 +321,15 @@ DABUR DAD DANCE +DATA DATE DATING DATSUN DAY DCLK -#! DDS +DDS DE +DEAL DEALER DEALS DEGREE @@ -292,33 +343,44 @@ DESI DESIGN DEV -#! DHL +DHL DIAMONDS DIET DIGITAL DIRECT DIRECTORY DISCOUNT +DISCOVER +DISH +DIY DJ DK DM DNP DO DOCS +DOCTOR +DODGE DOG DOHA DOMAINS -#! DOT +DOT DOWNLOAD DRIVE -#! DTV +DTV DUBAI +DUCK +DUNLOP +DUNS +DUPONT DURBAN DVAG +DVR DZ EARTH EAT EC +ECO EDEKA EDU EDUCATION @@ -330,13 +392,16 @@ ENGINEER ENGINEERING ENTERPRISES +EPOST EPSON EQUIPMENT ER +ERICSSON ERNI ES ESQ ESTATE +ESURANCE ET EU EUROVISION @@ -356,15 +421,22 @@ FAN FANS FARM +FARMERS FASHION FAST +FEDEX FEEDBACK +FERRARI FERRERO FI +FIAT +FIDELITY +FIDO FILM FINAL FINANCE FINANCIAL +FIRE FIRESTONE FIRMDALE FISH @@ -375,14 +447,15 @@ FK FLICKR FLIGHTS -#! FLIR +FLIR FLORIST FLOWERS -FLSMIDTH FLY FM FO FOO +FOOD +FOODNETWORK FOOTBALL FORD FOREX @@ -391,11 +464,16 @@ FOUNDATION FOX FR +FREE FRESENIUS FRL FROGANS +FRONTDOOR FRONTIER FTR +FUJITSU +FUJIXEROX +FUN FUND FURNITURE FUTBOL @@ -406,7 +484,8 @@ GALLO GALLUP GAME -#! GAMES +GAMES +GAP GARDEN GB GBIZ @@ -416,6 +495,7 @@ GEA GENT GENTING +GEORGE GF GG GGEE @@ -426,6 +506,7 @@ GIVES GIVING GL +GLADE GLASS GLE GLOBAL @@ -436,10 +517,13 @@ GMO GMX GN +GODADDY GOLD GOLDPOINT GOLF GOO +GOODHANDS +GOODYEAR GOOG GOOGLE GOP @@ -457,7 +541,7 @@ GS GT GU -#! GUARDIAN +GUARDIAN GUCCI GUGE GUIDE @@ -465,9 +549,12 @@ GURU GW GY +HAIR HAMBURG HANGOUT HAUS +HBO +HDFC HDFCBANK HEALTH HEALTHCARE @@ -475,23 +562,29 @@ HELSINKI HERE HERMES +HGTV HIPHOP -#! HISAMITSU +HISAMITSU HITACHI HIV HK -#! HKT +HKT HM HN HOCKEY HOLDINGS HOLIDAY HOMEDEPOT +HOMEGOODS HOMES +HOMESENSE HONDA +HONEYWELL HORSE +HOSPITAL HOST HOSTING +HOT HOTELES HOTMAIL HOUSE @@ -501,6 +594,8 @@ HT HTC HU +HUGHES +HYATT HYUNDAI IBM ICBC @@ -508,11 +603,13 @@ ICU ID IE +IEEE IFM -IINET +IKANO IL IM IMAMAT +IMDB IMMO IMMOBILIEN IN @@ -525,7 +622,9 @@ INSURANCE INSURE INT +INTEL INTERNATIONAL +INTUIT INVESTMENTS IO IPIRANGA @@ -539,14 +638,18 @@ ISTANBUL IT ITAU +ITV +IVECO IWC JAGUAR JAVA JCB JCP JE +JEEP JETZT JEWELRY +JIO JLC JLL JM @@ -561,6 +664,7 @@ JPMORGAN JPRS JUEGOS +JUNIPER KAUFEN KDDI KE @@ -574,12 +678,14 @@ KIA KIM KINDER +KINDLE KITCHEN KIWI KM KN KOELN KOMATSU +KOSHER KP KPMG KPN @@ -593,14 +699,18 @@ KZ LA LACAIXA +LADBROKES LAMBORGHINI LAMER LANCASTER +LANCIA +LANCOME LAND LANDROVER LANXESS LASALLE LAT +LATINO LATROBE LAW LAWYER @@ -609,7 +719,9 @@ LDS LEASE LECLERC +LEFRAK LEGAL +LEGO LEXUS LGBT LI @@ -620,37 +732,43 @@ LIFESTYLE LIGHTING LIKE +LILLY LIMITED LIMO LINCOLN LINDE LINK -#! LIPSY +LIPSY LIVE LIVING LIXIL LK LOAN LOANS -#! LOCKER +LOCKER LOCUS +LOFT LOL LONDON LOTTE LOTTO LOVE +LPL +LPLFINANCIAL LR LS LT LTD LTDA LU +LUNDBECK LUPIN LUXE LUXURY LV LY MA +MACYS MADRID MAIF MAISON @@ -662,9 +780,14 @@ MARKETING MARKETS MARRIOTT -#! MATTEL +MARSHALLS +MASERATI +MATTEL MBA MC +MCD +MCDONALDS +MCKINSEY MD ME MED @@ -676,22 +799,26 @@ MEN MENU MEO -#! METLIFE +METLIFE MG MH MIAMI MICROSOFT MIL MINI +MINT +MIT +MITSUBISHI MK ML -#! MLB +MLB MLS MM MMA MN MO MOBI +MOBILE MOBILY MODA MOE @@ -699,10 +826,13 @@ MOM MONASH MONEY +MONSTER MONTBLANC +MOPAR MORMON MORTGAGE MOSCOW +MOTO MOTORCYCLES MOV MOVIE @@ -711,6 +841,7 @@ MQ MR MS +MSD MT MTN MTPC @@ -718,37 +849,42 @@ MU MUSEUM MUTUAL -MUTUELLE MV MW MX MY MZ NA +NAB NADEX NAGOYA NAME +NATIONWIDE NATURA NAVY +NBA NC NE NEC NET NETBANK -#! NETFLIX +NETFLIX NETWORK NEUSTAR NEW +NEWHOLLAND NEWS -#! NEXT -#! NEXTDIRECT +NEXT +NEXTDIRECT NEXUS NF +NFL NG NGO NHK NI NICO +NIKE NIKON NINJA NISSAN @@ -758,8 +894,9 @@ NOKIA NORTHWESTERNMUTUAL NORTON +NOW NOWRUZ -#! NOWTV +NOWTV NP NR NRA @@ -769,30 +906,37 @@ NYC NZ OBI +OBSERVER +OFF OFFICE OKINAWA -#! OLAYAN -#! OLAYANGROUP -#! OLLO +OLAYAN +OLAYANGROUP +OLDNAVY +OLLO OM OMEGA ONE ONG ONL ONLINE +ONYOURSIDE OOO +OPEN ORACLE ORANGE ORG ORGANIC +ORIENTEXPRESS ORIGINS OSAKA OTSUKA -#! OTT +OTT OVH PA PAGE PAMPEREDCHEF +PANASONIC PANERAI PARIS PARS @@ -800,14 +944,17 @@ PARTS PARTY PASSAGENS -#! PCCW +PAY +PCCW PE PET PF +PFIZER PG PH PHARMACY PHILIPS +PHONE PHOTO PHOTOGRAPHY PHOTOS @@ -820,7 +967,7 @@ PIN PING PINK -#! PIONEER +PIONEER PIZZA PK PL @@ -831,13 +978,17 @@ PLUS PM PN +PNC POHL POKER +POLITIE PORN POST PR +PRAMERICA PRAXI PRESS +PRIME PRO PROD PRODUCTIONS @@ -847,6 +998,8 @@ PROPERTIES PROPERTY PROTECTION +PRU +PRUDENTIAL PS PT PUB @@ -857,10 +1010,13 @@ QPON QUEBEC QUEST +QVC RACING +RADIO +RAID RE READ -#! REALESTATE +REALESTATE REALTOR REALTY RECIPES @@ -871,6 +1027,7 @@ REISE REISEN REIT +RELIANCE REN RENT RENTALS @@ -883,14 +1040,18 @@ REVIEWS REXROTH RICH -#! RICHARDLI +RICHARDLI RICOH +RIGHTATHOME +RIL RIO RIP +RMIT RO ROCHER ROCKS RODEO +ROGERS ROOM RS RSVP @@ -907,6 +1068,7 @@ SAKURA SALE SALON +SAMSCLUB SAMSUNG SANDVIK SANDVIKCOROMANT @@ -915,6 +1077,7 @@ SAPO SARL SAS +SAVE SAXO SB SBI @@ -929,16 +1092,19 @@ SCHULE SCHWARZ SCIENCE +SCJOHNSON SCOR SCOT SD SE SEAT +SECURE SECURITY SEEK SELECT SENER SERVICES +SES SEVEN SEW SEX @@ -946,17 +1112,21 @@ SFR SG SH +SHANGRILA SHARP SHAW SHELL SHIA SHIKSHA SHOES -#! SHOP +SHOP +SHOPPING SHOUJI SHOW +SHOWTIME SHRIRAM SI +SILK SINA SINGLES SITE @@ -967,7 +1137,9 @@ SKY SKYPE SL +SLING SM +SMART SMILE SN SNCF @@ -988,8 +1160,10 @@ SPREADBETTING SR SRL +SRT ST STADA +STAPLES STAR STARHUB STATEBANK @@ -1014,6 +1188,7 @@ SUZUKI SV SWATCH +SWIFTCOVER SWISS SX SY @@ -1025,6 +1200,7 @@ TAIPEI TALK TAOBAO +TARGET TATAMOTORS TATAR TATTOO @@ -1033,6 +1209,7 @@ TC TCI TD +TDK TEAM TECH TECHNOLOGY @@ -1048,6 +1225,7 @@ THD THEATER THEATRE +TIAA TICKETS TIENDA TIFFANY @@ -1055,7 +1233,10 @@ TIRES TIROL TJ +TJMAXX +TJX TK +TKMAXX TL TM TMALL @@ -1077,6 +1258,7 @@ TRADING TRAINING TRAVEL +TRAVELCHANNEL TRAVELERS TRAVELERSINSURANCE TRUST @@ -1091,20 +1273,23 @@ TW TZ UA +UBANK UBS +UCONNECT UG UK UNICOM UNIVERSITY UNO UOL -#! UPS +UPS US UY UZ VA VACATIONS VANA +VANGUARD VC VE VEGAS @@ -1122,14 +1307,17 @@ VIN VIP VIRGIN +VISA VISION VISTA VISTAPRINT VIVA +VIVO VLAANDEREN VN VODKA VOLKSWAGEN +VOLVO VOTE VOTING VOTO @@ -1137,10 +1325,11 @@ VU VUELOS WALES +WALMART WALTER WANG WANGGOU -#! WARMAN +WARMAN WATCH WATCHES WEATHER @@ -1160,16 +1349,20 @@ WIN WINDOWS WINE +WINNERS WME WOLTERSKLUWER +WOODSIDE WORK WORKS WORLD +WOW WS WTC WTF XBOX XEROX +XFINITY XIHUAN XIN XN--11B4C3D @@ -1179,22 +1372,27 @@ XN--3BST00M XN--3DS443G XN--3E0B707E +XN--3OQ18VL8PN36A XN--3PXU8K XN--42C2D9A XN--45BRJ9C XN--45Q11C XN--4GBRIM +XN--54B7FTA0CC XN--55QW42G XN--55QX5D +XN--5SU34J936BGSG XN--5TZM5G XN--6FRZ82G XN--6QQ986B3XL XN--80ADXHKS XN--80AO21A +XN--80AQECDR1A XN--80ASEHDB XN--80ASWG XN--8Y0A063A XN--90A3AC +XN--90AE XN--90AIS XN--9DBQ2A XN--9ET52U @@ -1229,6 +1427,7 @@ XN--G2XX48C XN--GCKR3F0F XN--GECRJ9C +XN--GK3AT1E XN--H2BRJ9C XN--HXT814E XN--I1B6B1A6A2E @@ -1252,12 +1451,14 @@ XN--MGBA7C0BBN0A XN--MGBAAM7A8H XN--MGBAB2BD +XN--MGBAI9AZGQP6J XN--MGBAYH7GPA XN--MGBB9FBPOB XN--MGBBH1A71E XN--MGBC0A9AZCG XN--MGBCA7DZDO XN--MGBERP4A5D4AR +XN--MGBI4ECEXP XN--MGBPL2FH XN--MGBT3DHD XN--MGBTX2B @@ -1287,6 +1488,7 @@ XN--SES554G XN--T60B56A XN--TCKWE +XN--TIQ49XQYJ XN--UNUP4Y XN--VERMGENSBERATER-CTB XN--VERMGENSBERATUNG-PWB @@ -1319,10 +1521,11 @@ YT YUN ZA -#! ZAPPOS +ZAPPOS ZARA ZERO ZIP +ZIPPO ZM ZONE ZUERICH
